From 0a3c094b7e0ed1ad34b356c5d760a849414b8f9b Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sun, 7 Jul 2013 21:56:23 +0000 Subject: [PATCH] Tweak building doc for Fedora 19. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4409 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/an1.cc | 2 +- gpsbabel/an1sym.h | 4 ++-- gpsbabel/make-an1sym.pl | 4 ++-- gpsbabel/xmldoc/chapters/build.xml | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gpsbabel/an1.cc b/gpsbabel/an1.cc index 63ca40309..5f9a9c116 100644 --- a/gpsbabel/an1.cc +++ b/gpsbabel/an1.cc @@ -358,7 +358,7 @@ static void Destroy_AN1_Symbol(an1_symbol_record* symbol) static void Read_AN1_Waypoint(gbfile* f, an1_waypoint_record* wpt) { - short len; + unsigned short len; wpt->magic = ReadShort(f); wpt->unk1 = ReadLong(f); diff --git a/gpsbabel/an1sym.h b/gpsbabel/an1sym.h index c2ef4582c..f13cfd557 100644 --- a/gpsbabel/an1sym.h +++ b/gpsbabel/an1sym.h @@ -710,7 +710,7 @@ struct defguid { int FindIconByName(const char* name, GUID* guid) { - int i = 0; + unsigned int i = 0; for (i = 0; i < (sizeof(default_guids)/sizeof(struct defguid)); i++) { if (!case_ignore_strcmp(name, default_guids[i].name)) { memcpy(guid, &(default_guids[i].guid), sizeof(GUID)); @@ -722,7 +722,7 @@ int FindIconByName(const char* name, GUID* guid) int FindIconByGuid(GUID* guid, char** name) { - int i = 0; + unsigned int i = 0; for (i = 0; i < (sizeof(default_guids)/sizeof(struct defguid)); i++) { if (!memcmp(guid, &default_guids[i].guid, sizeof(GUID))) { *name = (char*) default_guids[i].name; diff --git a/gpsbabel/make-an1sym.pl b/gpsbabel/make-an1sym.pl index 1b6f47728..65ade95e3 100755 --- a/gpsbabel/make-an1sym.pl +++ b/gpsbabel/make-an1sym.pl @@ -288,7 +288,7 @@ print <<'END'; }; int FindIconByName( const char *name, GUID *guid ) { - int i = 0; + unsigned int i = 0; for ( i = 0; i < (sizeof(default_guids)/sizeof(struct defguid)); i++ ) { if ( !case_ignore_strcmp(name, default_guids[i].name)) { @@ -300,7 +300,7 @@ int FindIconByName( const char *name, GUID *guid ) { } int FindIconByGuid( GUID *guid, char **name ) { - int i = 0; + unsigned int i = 0; for ( i = 0; i < (sizeof(default_guids)/sizeof(struct defguid)); i++ ) { if ( !memcmp(guid, &default_guids[i].guid, sizeof(GUID))) { diff --git a/gpsbabel/xmldoc/chapters/build.xml b/gpsbabel/xmldoc/chapters/build.xml index e8d198620..548f51dc0 100644 --- a/gpsbabel/xmldoc/chapters/build.xml +++ b/gpsbabel/xmldoc/chapters/build.xml @@ -41,8 +41,9 @@ That can be done easily with the single command: Qt is required for all builds. Mac and Windows users can download binaries from Qt Downloads -Fedora users may need to 'yum install libqt4-core libqt4-dev'. Ubuntu users may need to -'apt-get install libqt4-core libqt4-dev'. +CentOS users may need to 'yum install libqt4-core libqt4-dev'. +Fedora users may need to 'yum install qt4-devel'. +Ubuntu users may need to 'apt-get install libqt4-core libqt4-dev'. Expat is strongly recommended for source builds as it is -- 2.30.2